don't deactivate menu when menu_item isn't sensitive (#61389)

Sat Nov 24 22:05:27 2001  Kristian Rietveld  <kristian@planet.nl>

        * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't
        deactivate menu when menu_item isn't sensitive (#61389)

diff --git a/ChangeLog b/ChangeLog
index abe4f03913cb2326f6d23c749b1555800946e154..093f0add5186629092526e10701fecd802038bf7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Nov 24 22:05:27 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't
+       deactivate menu when menu_item isn't sensitive (#61389)
+
 Sat Nov 24 15:35:26 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index abe4f03913cb2326f6d23c749b1555800946e154..093f0add5186629092526e10701fecd802038bf7 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sat Nov 24 22:05:27 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't
+       deactivate menu when menu_item isn't sensitive (#61389)
+
 Sat Nov 24 15:35:26 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index abe4f03913cb2326f6d23c749b1555800946e154..093f0add5186629092526e10701fecd802038bf7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Nov 24 22:05:27 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't
+       deactivate menu when menu_item isn't sensitive (#61389)
+
 Sat Nov 24 15:35:26 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index abe4f03913cb2326f6d23c749b1555800946e154..093f0add5186629092526e10701fecd802038bf7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sat Nov 24 22:05:27 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't
+       deactivate menu when menu_item isn't sensitive (#61389)
+
 Sat Nov 24 15:35:26 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index abe4f03913cb2326f6d23c749b1555800946e154..093f0add5186629092526e10701fecd802038bf7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sat Nov 24 22:05:27 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't
+       deactivate menu when menu_item isn't sensitive (#61389)
+
 Sat Nov 24 15:35:26 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index abe4f03913cb2326f6d23c749b1555800946e154..093f0add5186629092526e10701fecd802038bf7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Nov 24 22:05:27 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't
+       deactivate menu when menu_item isn't sensitive (#61389)
+
 Sat Nov 24 15:35:26 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index abe4f03913cb2326f6d23c749b1555800946e154..093f0add5186629092526e10701fecd802038bf7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Nov 24 22:05:27 2001  Kristian Rietveld  <kristian@planet.nl>
+
+       * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't
+       deactivate menu when menu_item isn't sensitive (#61389)
+
 Sat Nov 24 15:35:26 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 65626e0018097d1e9ac7cf91fe9fa145bc5db92c..7f3deea037af5fcb799809a08b14397a45076f79 100644 (file)
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -469,6 +469,8 @@ gtk_menu_shell_button_release (GtkWidget      *widget,
                  return TRUE;
                }
            }
+         else if (menu_item && !GTK_WIDGET_IS_SENSITIVE (menu_item))
+           deactivate = FALSE;
          else if (menu_shell->parent_menu_shell)
            {
              menu_shell->active = TRUE;